Merge from trunk
authorJason Rumney <jasonr@gnu.org>
Wed, 20 Jan 2010 23:04:21 +0000 (07:04 +0800)
committerJason Rumney <jasonr@gnu.org>
Wed, 20 Jan 2010 23:04:21 +0000 (07:04 +0800)
commitf3d14af99f49b1db61f395614c0ba92bc9990b90
tree60a1ac5470bce5ec443ad993c3aa65c5a8ab536b
parentaca9b8b8f7900976ed4b3d15adfdbb6cb93abab9
parentf8314a59a0074e668c431b1e73281269a2df1d2d
Merge from trunk